From: Len Brown <len.brown@intel.com>
Date: Sun, 15 Aug 2010 05:06:31 +0000 (-0400)
Subject: Merge branch 'linus' into release
X-Git-Tag: archive/raspbian/4.9.13-1+rpi1~10^2~16918^2
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/%22bookmarks:/?a=commitdiff_plain;h=95ee46aa8698f2000647dfb362400fadbb5807cf;p=linux-4.9.git

Merge branch 'linus' into release

Conflicts:
	drivers/acpi/debug.c

Signed-off-by: Len Brown <len.brown@intel.com>
---

95ee46aa8698f2000647dfb362400fadbb5807cf